From b99088974ebac97cbe8721c863cb248fdd056c86 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Wed, 9 Jan 2002 20:43:11 +0000 Subject: [PATCH] pass NULL to gtk_tree_model_rows_reordered and not an iter with user_data Wed Jan 9 21:31:44 2002 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to gtk_tree_model_rows_reordered and not an iter with user_data set to NULL (which is an invalid liststore iter, so iter_n_children failed, etc) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkliststore.c | 6 ++---- 8 files changed, 51 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8998f80fac..c1e13fd827 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Jan 9 21:31:44 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to + gtk_tree_model_rows_reordered and not an iter with user_data + set to NULL (which is an invalid liststore iter, so + iter_n_children failed, etc) + 2002-01-09 Sven Neumann * tests/prop-editor.c: declared internal functions static. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8998f80fac..c1e13fd827 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Wed Jan 9 21:31:44 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to + gtk_tree_model_rows_reordered and not an iter with user_data + set to NULL (which is an invalid liststore iter, so + iter_n_children failed, etc) + 2002-01-09 Sven Neumann * tests/prop-editor.c: declared internal functions static. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8998f80fac..c1e13fd827 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Wed Jan 9 21:31:44 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to + gtk_tree_model_rows_reordered and not an iter with user_data + set to NULL (which is an invalid liststore iter, so + iter_n_children failed, etc) + 2002-01-09 Sven Neumann * tests/prop-editor.c: declared internal functions static. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8998f80fac..c1e13fd827 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Wed Jan 9 21:31:44 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to + gtk_tree_model_rows_reordered and not an iter with user_data + set to NULL (which is an invalid liststore iter, so + iter_n_children failed, etc) + 2002-01-09 Sven Neumann * tests/prop-editor.c: declared internal functions static. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8998f80fac..c1e13fd827 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Wed Jan 9 21:31:44 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to + gtk_tree_model_rows_reordered and not an iter with user_data + set to NULL (which is an invalid liststore iter, so + iter_n_children failed, etc) + 2002-01-09 Sven Neumann * tests/prop-editor.c: declared internal functions static. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8998f80fac..c1e13fd827 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Wed Jan 9 21:31:44 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to + gtk_tree_model_rows_reordered and not an iter with user_data + set to NULL (which is an invalid liststore iter, so + iter_n_children failed, etc) + 2002-01-09 Sven Neumann * tests/prop-editor.c: declared internal functions static. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8998f80fac..c1e13fd827 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Wed Jan 9 21:31:44 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort): pass NULL to + gtk_tree_model_rows_reordered and not an iter with user_data + set to NULL (which is an invalid liststore iter, so + iter_n_children failed, etc) + 2002-01-09 Sven Neumann * tests/prop-editor.c: declared internal functions static. diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 502dae564b..9b95a757ec 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -1567,7 +1567,6 @@ gtk_list_store_compare_func (gconstpointer a, static void gtk_list_store_sort (GtkListStore *list_store) { - GtkTreeIter iter; GArray *sort_array; gint i; gint *new_order; @@ -1611,11 +1610,10 @@ gtk_list_store_sort (GtkListStore *list_store) new_order = g_new (gint, list_store->length); for (i = 0; i < list_store->length; i++) new_order[i] = g_array_index (sort_array, SortTuple, i).offset; + path = gtk_tree_path_new (); - iter.stamp = list_store->stamp; - iter.user_data = NULL; gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store), - path, &iter, new_order); + path, NULL, new_order); gtk_tree_path_free (path); g_free (new_order); g_array_free (sort_array, TRUE); -- 2.30.2